Resolving Merge Conflicts | Getting Started With Github